Let jeeps pick up wrapped allocators. Make defs.h multiply-included safe.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 4c23177236abdf4d286c0970ead45ecc4351e7ed..0bdde95d7d46981510a68254bfde12e528d94253 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -16,7 +16,8 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
-
+#ifndef gpsbabel_defs_h_included
+#define gpsbabel_defs_h_included
 #include <time.h>
 #include <stdlib.h>
 #include <math.h>
@@ -471,3 +472,4 @@ double degrees2ddmm(double deg_val);
  */
 #define unknown_alt -99999999.0
 
+#endif /* gpsbabel_defs_h_included */

diff --git a/gpsbabel/jeeps/gps.h b/gpsbabel/jeeps/gps.h
index e2d6f4d2789de340cedd5299a7008f43934e71e3..746092bc9349303582d3db46ecac1e3cbe99e169 100644 (file)
--- a/gpsbabel/jeeps/gps.h
+++ b/gpsbabel/jeeps/gps.h
@@ -6,6 +6,7 @@ extern "C"
 #ifndef gps_h
 #define gps_h
 
+#include "../defs.h"
 #include "gpsport.h"
 #include <time.h>